Merge "Avoid triggering StrictMode for storage notifs." into qt-dev