Merge "Merge "Wait for all of associated activities done animating" into rvc-dev am: e873ed32 am: 7904f5a6 am: 53ab7d5a" into rvc-qpr-dev-plus-aosp