am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev

* commit '00d4c94625226ab325def94e9b82074f39572b43':
  Fix keyguard issue where an incoming SMS would switch widget