Merge "Rewrite R constants before creating Application"