UserPrefernces
fixed bug in usersidbar
little refactoring for REL2_23

Change-Id: If9461c41f213f6d627c5ceb85c4b04749d318fda
Merge "UserPrefernces fixed bug in usersidbar little refactoring for REL2_23"