Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
am: 5d7fd4abc3
am: 222ccca3af
am: 5337625d14
am: 3a4a4e785c
Change-Id: I423a85d95983df8c846dcf5f0ef0acae46bc0cff
This commit is contained in: