Merge "Removing privileged context requirement for civic location (server)" into qt-r1-dev