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

Change-Id: I15d169b0f0f202c1a4362d1394871d1d4d7f6efd