Merge "Force application context for KeyChain bindings"