squashed gps changes from caf (test)
user switcher to lockscreen