Merge "Fix ScreenDecorWindowTests on devices without nav bar"