Merge "Fix the trampoline activity shows at the top due to app transition."