Merge "[expressive design] Update back button in App bar." into main