Merge "Fix shape & grid option items background" into main