Merge changes I93b8ed74,I43decfee

* changes:
  Update callbacks when initializing to initial state
  UI Keyguard fixes