Merge "Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation"