Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev