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

* commit 'c51e7ff96d97cdcdd420f54df2c3171c1016b14b':

Change-Id: If1b158d525e8d9367c3d1ddc408695a613175e71