Merge "Add support for preopted app images"