Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"