Only close the pre-/post-edit CTAs if the user clicks X

Change-Id: Idc714baf9bef0121a3d9c8f39eebca77f65a6545
Merge "Only close the pre-/post-edit CTAs if the user clicks X"