Merge "Refresh signal cluster for airplane switch." into jb-dev