Cherry-pick app switch caching (#2724) into dev6x. See cherry-pick done into dev7x: #2726. Make sure not to remove this method #2734.
