Merge "Fix two-pane RTL" into ub-gmail-ur14-dev