Merge "apply horizontal fittocontent for tizen_2.1" into tizen_2.1