Merge "Support multiple app versions across system partitions"