Merge "Add mediaStore.waitForIdle before scans" into sc-dev