Merge "Move profiles to use bitmaps for startup methods"