Merge "Make sure shares and deletes are enabled after they're changed to be visible." into arc-apps