Merge "Fix wonky background rendering in spring loaded mode" into honeycomb-mr1