Fix scrolling issues for the single upload process

Change-Id: I7ad6fa3edadc48c0f3d7df313b43b27e3bbe799d