Merge "SF: Remove forced transaction on screenshot" into nyc-dev am: 854071a38f am: c51e7ff96d
am: 79cee840dc

* commit '79cee840dcaee09851a800fcd0f6544473c701a5':

Change-Id: I40ab84d86100e3b5477ece8d9e70f5daaa463ae1