Merge "Change in media scanner to set correct date"