Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev