Merge "Dismiss keyguard when opening settings" am: 3d2a4f2300

Change-Id: I2cd507d27e9996e7cc7422a271eff64ec4062a05