Merge "Do not resume activity if behind a translucent task"