Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev