Merge "Added margin of size 24dp above search bar on secondary display" into tm-qpr-dev