Merge "Check shortcut enabled before auto trun on OHM" into sc-dev