Merge pull request #29 from walmartlabs-wmusiphone/searchDisplayControllerFixMerged

Search display controller fix merged
revert 00908a17fcc536644bf9bf912cd1caa64fa98af3
revert f4fe759f3e3ff1f4d26a4dad8c2634df8eb4aedb
Merge pull request #30 from walmartlabs-wmusiphone/issue/CB-2451-revert-PR-1169

Issue/cb 2451 revert pr 1169
Merge branch 'jewsharp_dev' into issue/CB-2451