Merge "Add @IdRes annotations to View properties"