Merge "Update for MoreOptionsAction"