Merge "[3.0] change adding focus indicator logic" into tizen_3.0