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: d3a61205
am: ad5ff191
Change-Id: Ic321ec1ae0126f2d490a637c110e164bc5b20f2d