Merge "Fix visible problem on status bar"