Merge pull request #16403 from crdlc/bug-973853

Bug 973853 - Images are not displayed the second time in link and import...
(cherry picked from commit 70c72c50e9cc17503ece37c990a3d0242664b9b1)
Merge pull request #16609 from EverythingMe/bug-975917

Bug 975917 - [Everything.me] Tapping homebutton while in Collection Rena...
(cherry picked from commit f03f667e1d92595df8bfddd8b0f0f7ec64d28230)