Merge "Migrate metrics logs to reflect new One-handed UI changes in Settings" into sc-dev