Merge "Make system UI settings work for multi-user (2/2)" into cm-10.1

Change-Id: Ibccfa6878884590c4662d2da149fa486bf1f495e