Merge "Fix bug #6140391 Make RTL awareness as an opt-in into the AndroidManifest"