Merge "Merge "Update the style of navigation button" into rvc-dev am: b5ec9c4d am: 79246a06" into rvc-d1-dev-plus-aosp