Merge "Added jank accounting to systemapps.sh and fixed whitespace issues"