Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev