Merge "TwoPaneLayout changes position of FAB as well" into ub-gmail-ur14-dev