Merge "(TouchMode Permission) Update shell permission"