Merge "Display Forbidden State during Manual Network scan. DO NOT MERGE" into pi-dev