Merge "Migrate trigger logic to fullfill new UI changes for One-handed mode settings." into sc-dev