SystemUI: set correct initial NFC toggle state

Change-Id: I451f53bb2ae533823c214a66d83ce6a92ceb5025
Signed-off-by: Roman Birg <romanbirg@gmail.com>
SystemUI: avoid NPE when no toggles are set

Change-Id: Idc3fe5b43f545fed51f33b06fb5888fb5e226b7a
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Updated Japanese translations

Change-Id: I1493bee91ef37141c0b68d6526c77e64fca0816c
Signed-off-by: rdgate <rdgate@gmail.com>
Merge "SystemUI: set correct initial NFC toggle state" into jb-mr1
Merge "SystemUI: avoid NPE when no toggles are set" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1