Merge "Fix panel bitmap"