Fix bug 5167786 - make sure custom option panels still work.

Change-Id: Ife3ca80f593c141f680fcc5178687112a538474d
1 file changed