Merge "Renaming or moving files should initiate scan." into qt-dev am: b9c822d6b7
am: 10c5887712

Change-Id: Ib14a46db2049bf708f944ae41bc8513ad507e45c