am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from...
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '17f9fe13':
Fix 5705837: Dismiss keyguard when launching Settings from Statusbar