Supermarket, 50 apartments proposed in Giralang shops redevelopment