Fix late discovered WindowzBuilder Crash and Bugs Change-Id: Ie9d74fcdf1f5076dfd10c4da645feb661839e7fa