am 6a40f7a2: am 7cbb7c60: Merge "stop using hardware layers when workspace stops moving" into honeycomb

* commit '6a40f7a2157bb42f9c3a488c34786f4bf7c1a316':
  stop using hardware layers when workspace stops moving