master
8187443: Forest Consolidation: Move files to unified layout
8213183: InputMethod cannot be used after its restarting