Fix restore mDNIe mode after screen unlock, removed hardcode for Dynamic mode

Change-Id: I4c7ed7d45ddd8940861b5639536beb83dcc93fab