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

* commit '4a8ac7cb46500538b964bc8247ff3159fb65d9f5':
  SF: Remove forced transaction on screenshot

Change-Id: Id3378fca35a988b475ec06e4888c5883cbeacac4