Changes for action button display and for proper operation of export

GCP-9513

Post commit code review : Daniel Jao