Merge changes Ic768f57f,I6f1396ca into udc-mainline-prod

* changes:
  Fix for loss of `Recents` content from private tab on flag change.
  Fixing profile badge themes for various grid and list holders.