Merge "Add margin above ambient indication container" into tm-qpr-dev