[Settings tab] picking up restrictions fix

Change-Id: I731822b7756bd8e616c6a76bac5a6afe95957c8d
Merge "[Settings tab] picking up restrictions fix"