Merge "Compose GAR changes" into ub-gmail-ur14-dev