Merge proposals dependent on lp://qastaging/~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event

1. gallery-app-fix_show_imported_media_on_today_event
2. Dependent merge proposals