Merge "Add CTS test for in-places updates of media files with incorrect path" into qt-dev