Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev