Merge "Fix multi-user behaviour for system UI settings (1/2)" into cm-10.1

Need to do small changes to not break clock and date customization.

Change-Id: Ic6e737f1e3641184289cd000b047f7623fbb7a5b