Merge "Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc79 am: b3f96855 am: ee77a1bd" into rvc-qpr-dev-plus-aosp