Merge "Minor changes to actionbar for message view"