Frameworks: fix possible NPE + and missing expandable panel correction

Thanks Jorge for pointing it out. This version is way nicer.

Change-Id: I7a65a05ef533c90cbfc68d4de996eae7a0ff66b7