Merge "[ElmSharp.Wearable] fix naviframe surface issue"