Merge "Clear mTranslucentActivityWaiting if the activity is going to relaunch" into sc-dev