Merge "Import androidx AppBar changes" into main