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