Merge "Update visibility logic in realStartActivityLocked"