Merge proposals dependent on lp://qastaging/~larsu/overlay-scrollbar/only-enable-for-supported-themes

1. only-enable-for-supported-themes
2. Dependent merge proposals