Merge "Fix: Recent Apps not closing" am: 0d5b27b2db
am: c130b41517

Change-Id: If8bffd34efab2a6b7ce5d2d4900950769290c5bf