Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev