Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode.""" into tm-qpr-dev