Merge "Integrating keystore with keyguard (Part 1 of 4)"