Merge "Handle phone status changes in cluster demo renderer" into nyc-dev