am 21dd5622: Merge "Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)"

* commit '21dd5622a476c7b351e543c669184103b858b697':
  Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)