Merge "Move simuilate device appeared/disappeared back" into main