Merge "Workaround missing OnChannelClose for DisplayManagerService" into pi-dev