Merge "Fixes the secondary splitscreen dimensions" into pi-dev
am: 2d4873eea1

Change-Id: I7db6bc88f80ffc77efd73ed340621cb1a7127db3