Merge "Fix VR-related system APIs" into qt-dev am: ef2e036f96
am: cc2a4954ab

Change-Id: I92101a3ca2960ff4616705d35f84fea7fc2e0283