Merge "Fix setting z value issue in Layout" into devel/master