Merge "Move Settings app to /product"