Merge "Clear calling identity for trusted change from keyguard" into main