Issue #16654827 Settings search does not close all the way. Change-Id: I6e46ac828a6a5e90e29761c176899b90d32563c5