Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev am: baea1c87f5
am: a3e36f8e50

Change-Id: Iaaba0cd84e04bc49aa3865ff48410f060df0ff49