Merge "Implementing navigation handling for carousel (2)" into main