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

Change-Id: Id2448189d314aeafbd1f38c61f31cb0f37c2ec60