Merge "Don't reject notifications and wait until new addressed player is ready...
Merge "Don't reject notifications and wait until new addressed player is ready (1/2)" into oc-dr1-dev am: a8c7ddb9 -s ours
am: ea5b4f43 -s ours
Change-Id: I3c16e9b42951bee646e72cb2cd9db702332e8fe6