Merge "Updates after Handle/Constrainable merge" into tizen