Merge "DO NOT MERGE: Fix a few issues with foreground service location accesses." into qt-dev