Merge "No show AppButtons for system modules"