Merge "Fix no reaction when tapping permission dialog button in shortcut...
Merge "Fix no reaction when tapping permission dialog button in shortcut service page" into qt-dev am: 4891ea2d am: 55bfbfed
am: 4fedf61f
Change-Id: Ieed4b97a7d0eab7fe884b3d78c6b930bcfbf392d