Merge "Promote app transition target its ancestor if possible."