Lint fixes

Merged Craig Earley requested to merge lint-fixes into master

This merge fixes or safely suppresses a bunch of Lint warnings, preserving those that may have an impact on functionality or design. I've tested on multiple devices, so I'm going to merge immediately.

Merge request reports