Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev