Merge "[Fix] Unable to show output device indicator after reboot"