Merge "Remove redundant logic about System UI visibility"