Adds restriction check to settings changes detection algorithm

Closes-Bug: #1377870
Closes-Bug: #1389671

Change-Id: Ifa6e9f7ea3292c8176c3d277285fd46a9b5693bd
Merge "Adds restriction check to settings changes detection algorithm"