Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev