Merge "Turn on ActionBar on the 1-pane message list"