Merge "Move privacy icons together in status bar"