Merge "tizen: Add additional unit for "unified" user session" into tizen