Don't remove badges when moving client page

Bug: 70687
Change-Id: Iad9581df09e3dbf8172fa4a927531965209bc237
Merge "Don't remove badges when moving client page"