Merge "Fix the disappearing buttons on the actionbar"