Merge "No more need for layers in 2-pane" into ub-gmail-ur14-dev