Merge "Swaps position of expand button and bell icon."