Finish implementation of plus upgrade banner and gold icon display lo…
b3a380b
…gic for the case when the panel is not both in detailed view and expanded
