Sync up with BeanStalk for some Active Display changes.

Change-Id: Ia69dfb737818b24e3e449d281b69b250cad8b008