[PROTO] Merge swap_draft <- tizen_2.2 as generic commit