Merge "Add a setting for allowing overlays on Settings app" into rvc-dev