Merge "Remove IKeystoreMaintenance#getState()" into main