Merge "Don't reject notifications and wait until new addressed player is ready (1/2)" into oc-dr1-dev
am: 03e16a77b7  -s ours

Change-Id: Ide438487acd0703f844657bba6440841edf8833e