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

* commit '52ef24bbb4259222f584a2d49720dcbcf59d463f':