Merge "Fix issues caught by Android Lint"