Merge "Improves Settings search result of Flash Notifications" into udc-dev