Merge "Enable stylus scale by default for apps targeting MNC+"