Fullscreen fix

Bug: 56374
Change-Id: I28b90244e3bb97654e4f6c9b0c07a8d336ffdd78
Merge "Fullscreen fix"