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

Change-Id: I50fad5324559a37634a3f20dd7e40e9927e1feb4