Merge "Check themes of current user, not user 0." into cm-10.1

Change-Id: I93f7f2170b7f7e1e235c47f3b0a0306a05030fbc