New logic to determine whether to show curation toolbar

Change-Id: I19190601488e2b528ed3d94a98678d1dd733d9aa