Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev am: 0b2f7503a8
am: 674271fe04

Change-Id: I9a4ca961ff4674563b58fb5fe53c8ec559dd77c2