Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev