Merge "Enable the System Navigation settings page in AOSP" into rvc-dev