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

Change-Id: I45139d0e8d284b1ed20706e425742c1bfcd8cb40