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

Change-Id: I465e7972552802e1e5c72f36e723bcde2c027c19