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

* commit '854071a38f250bd0638f1dfdb99b9ccc0010e7d0':
  SF: Remove forced transaction on screenshot

Change-Id: I79297918957661befdec24345bdfff2720433188