Merge "Prevent causing insets if the system bar is shown forcibly" into rvc-dev am: b979998eb4 am: 5a6f68d834

Change-Id: Ia94b6f4914a828429c1470c112f0f5571f888250