Merge "Fix NPE when store brightness and displayDevice is null"