Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev