DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode."

This reverts commit 00d05a454bdf215671778a62140d1501073fdc70.

Reason for revert: Only reverting to cherry-pick to tm-qpr1-release

Change-Id: I4831a7d47235ca195c92cc6bc298056fee1db138
2 files changed