Merge "Remove screenshot dismiss button in non-accessibility mode"