Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1