Merge "Remap per app id for AR/location sources" into sc-dev