Story 882: Upload overlay back behaviour

Change-Id: I89fce902245f2fd0913d0f28179a8879fdd5717e
Merge "Story 882: Upload overlay back behaviour"