SystemUI: cleanup

Change-Id: I93e4de947810272e7fa097e801f4c9f1e1f6c69b
SystemUI: fix screenshot touch bug

Change-Id: I87b702ae998b07d5a93e8391c54992ef3b980b5b