Merge "Restore Focus after rotation if we are searching"