Merge "AmbientIndication: Add tap again hint"