Merge "Fix broken shortcut manager CTS." into pi-dev