Merge proposals dependent on lp://qastaging/~ken-vandine/ubuntu-system-settings/fix-hide-broken-panels-on-snappy

1. fix-hide-broken-panels-on-snappy
2. Dependent merge proposals