Merge "fix action appearing after cab" into honeycomb-mr1