Make folders with subfolders selectable when creating widgets b/10847899 Change-Id: Ie30cadf31747431f1c5b998b3d32e109c1a6c6b9