Merge "Merge "Do not show a recording app more than once" into rvc-dev am: d514712c am: 6b0d3dfb" into rvc-d1-dev-plus-aosp