Merge "Prevent overdraw for compose" into ub-gmail-ur14-dev