Merge "Show other profile tab if 0 apps in current profile and >1 in the other." into rvc-dev am: 2dda126b01 am: 16ec3b2c46

Change-Id: Ic357dc5a8f4149c40750b86451e5b2b7e520ddb9