Merge "Refactor global actions items and lock message view."