Merge "Move SystemUI out of system UID."