Locked settings warning in the Display Changes dialog

Closes-Bug:#1325710

Change-Id: Ib35df837bcdfd5e908c1caa23649e648dbe06acc
Merge "Locked settings warning in the Display Changes dialog"