Merge "[4.0] Handled pre-resume scenario of watch application" into tizen_4.0