Merge \"Fix testConfigurationUpdatesWhenResizedFromFullscreen\" into nyc-dev
am: 1551ff999d

Change-Id: Ia21b2f8de682293c6c3008e0a69fc051e5393275