Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"