Merge "Dont enforce FLAG_ACTIVITY_CLEAR_TOP when FLAG_ACTIVITY_REORDER_TO_FRONT is set" into main