Merge "Fixed listeners were unexpectedly unregistered when device rotated" into rvc-dev