Merge "Don't change ToastBar bottom margin." into jb-ub-mail-ur10