Fix screens

Merged Agustín Maio requested to merge fix_screens into 11.0-stage

Merge request reports