Separate activity and thanks section when no uploaded image

Bug: 55537
Change-Id: I9ac0cef95cfffd5ccf8f9ebecb69fd02fbcb3b91
Merge "Separate activity and thanks section when no uploaded image"