Merge "Change the OpenGL viewport when new layout params are used. Bug #3303158"