Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev