Merge "fix(status bar): wifi and mobile icons flickering in large font/display size" into main