Merge changes I5d21645b,I8928e357

* changes:
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.