Merge "Fix FLAG_ACTIVITY_CLEAR_TOP not working for aliased activities"