am d3ecd55f: am ad20b112: Merge "Fix ActionMode not being inset correctly" into mnc-dev

* commit 'd3ecd55f83e218d1e0e5a7e2fb26b2876b54b8bc':
  Fix ActionMode not being inset correctly