Merge "Hide the software input based on its state." into mnc-dev