Merge "Only show emergency actions if enabled" into mnc-dev