Merge "Support4Demo: Use support APIs to fix lint warnings"