am 72a174de: Merge "Fix wonky background rendering in spring loaded mode" into honeycomb-mr1

* commit '72a174de20d06c8592b4de5bda4b13a96d05be7a':
  Fix wonky background rendering in spring loaded mode