Merge "Fix PIP settings icons shows in unexpanded state." into pi-dev